Merge changes from emacs-23
authorChong Yidong <cyd@stupidchicken.com>
Sat, 1 Oct 2011 18:47:22 +0000 (14:47 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Sat, 1 Oct 2011 18:47:22 +0000 (14:47 -0400)

Trivial merge